fixed naoufal 1.4