I would still be in favor of doing the template change in addition to the core file change as an anti-bugging measure. Thanks to MC# for tightening up my code. :)