fixes issue 22