Issue #423, #413, #463, #474 fix after  #429 implementation