fixes issue 61