Tweak #2532

Ping @quickfur