Some fix for JS Module