Removed unneeded hack