Ugly fix