fixes issue 71