more work for #1368