UGLY fix