Fix for hack 1.1