Minor optimization of import()

Fixes issue #6