ensured backwards compatibility to MW prior 1.15.2. Credits to Chris Key