Fixing a hack