Fixing a hack - yuk!!!