fixed commonJS support