Wibble to earlier case-merge fix