Ok great, I'll wait for your fix before refactoring