dropped unnecessary non-null check