fix for #1124