Fix to make it all run