Fixed working directory dependency bug