fix back-port/merge glitch