Fix for exports undefined issu