Fixes issue #72