Bugfix plugin for CupCake.