Auto 824b

This is an attempt to re-do a small fix that never got merged a couple of months ago.