Anton is no more :(
Fixed merge conflict