fixed exports for common