#1131 fixes