Fix for #1934