Solving issue #736

This pull request solved issue #736