reverted from lazyloading
fixes issue #161