fix copypasta-o to fully fix #9295