Changed the hack in my next pull request.