Tweak auto insert behaviour