Bug fix for issue https://github.com/bbangert/beaker/issues/61

Bug fix for issue https://github.com/bbangert/beaker/issues/61