Quick fix b5 to b8