Fixing #1938.