fixed feedback on the previous merge request