Fix compatibility with MW 1.22