fixed issues with treeshake