tried to fix guillaumes bug