fixes issue 23