Fixed issue with module export