Fixed merge fail from patrick-koc