Fixed missmerge in a1cd4ba18