Fix for new Bolt distribution