Yep, this is the fix I had in mind too