Fix for wrong merge