Fix for #2064