Fix for b8