recent changes to prevent some harmless bugs