better fix for the working directory thing