fixes issue 33