Fixed export behavior with temp fix