Issue #423 fix after  #429 implementation