Fixed bug where initial start was not working