VID-867 Fix the problems