add compatibility with MW18