Compat with latest WB DM version