FIX : merge little mistake