755898 Fix the issues

Authored and Committed by Stasiek Michalski 4 years ago
    Fix the issues