Fix problem after merge