fixes issue 85