Fixes issue 74.