minor changes for rare error prevention