Removed the hack