Fixed task 240125