Fix after merge problem