Removed disgusting hacks