removed the issue 559 part of this pull request