Removed hack