Hardening/523

Fix issue #523 

This PR goes only to develop branch (as it is a fix for a functionality included only in develop)