Thanks! I will include this fix as well in a new patch I will make considering Jonathan's comments as well