fixes for #1375