fix for #2076