Removed dirty hack.