fixes issue 28