Fixed merge fail from Hampl