fixes for #2346 #2303