Successfully tested and solved issue #912 by TDD