revert b904cf7 Merge pull request #319 Fix-bug-20190115 into develop
