Fix problems with promotion