proposed fix for https://github.com/bolt/bolt/issues/1512