Fix overzealousness