Yes and it seems like a better solution. I'm going to try it and update my fix, if it works.