More conditions

See also the discussion here: