Fix wrong merge (2 previous commits)