Despite my best effort, I have to do yet another merge fix