fix for iss53
hotfix commit
fix for iss53 finish;
Merge branch 'iss53'