more merge induced bug fixing