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