fix on the condition :P