fixes issue 2221