Fixed promotion bugs