Fix run method to work on first run