Fixes issue #156