Fixed to run properly