We can work around the exported dist issue