Raised a new pull request #593