Fixing previous hack