Fixed to work with MW v1.24

Change-Id: Id72a2859b7d0d3b40c2fc100968e8b8abdfc7b24