I'm marking this a dupe of the longer standing bug, though this one clearly has outlined the fix required well.
I'm marking this a dupe of the longer standing bug, though this one clearly has outlined the fix required well.