Fix for #1983