fix for task 18782