fix for #1214