Fixes issue #76