fixes issue 34