FIX second condition. It needs a better tests.