fix for #2129