Bug fix
b3 merge