Make things unbroken
Change to make it work
This works on linux and mac and should work for windows