Followup fix for PR #22
Merge remote-tracking branch 'cmars/cmars-004-bakeryfix'