Fixing issue #263 by removing exports dependency