Fix for working directory