As further development of issue #423
As further development of issue #423