removed superfluous ||=