More for #1288