overzealous conditional removed