Develop

One more pull request to fix a reported issue