Fixed the loader

Fixes issue #8