Fixes issue #128 (well at least partially)