fix loading for amd and commonjs
fix loading for commonjs and amd