UGLY workaround is UGLY