test and fix for #1305 part 2