Removed faulty condition