Removed the HACK-comment