fix for #0015913