Fixing problme in previous merge