Ugly fix
Fix of ugly fix