Fix compatibility with MW 1.21

Change-Id: Ie84ebcb1f16d3fd4157222027cfb799e692b774d