Fix promotions aside, Fixes #45