I will take a look for 5.0.2. We are working on what I think will end up being the basis of a better solution, but I am not against including a fix like this in the interim.