removed wrong condition