fixes issue 96