Make it work without the hack