Merge pull request #630 from hqmatics/master

fix for issue https://github.com/bolt/bolt/issues/629