fixes for task 18974