fix for #1137