Solved issues with the previous merge