removed spurious check on else variants