Fix for issue #1864.