Fixed to make it all work