From fix1
Fixed merge conflict