fix for #1261