Removed: Nasty fix