Test and fix for #1919