fixing remi's nitpick
merge