Adding compatibility with webmcr 2.4+