Fixed to work with MW v1.24