Bugfix when using MBZ ID