imported Steve's change and fixed conflict