Fix for #1824, CR 1107