Fixed working directory (old fix failed to work correctly)