You're completely right. I applied your fix