Fixed importing into commonjs environments