MB-32
bug fixing