Bug fixed, hack removed