fix for #2132