mazor bug fixing