Better handling of the previous bug fix.
Better handling of the previous bug fix.

blizzardwarriorwx/SHARPpy,scollis/SHARPpy,djgagne/SHARPpy,blizzardwarriorwx/SHARPpy,scollis/SHARPpy,scollis/SHARPpy,djgagne/SHARPpy,djgagne/SHARPpy,blizzardwarriorwx/SHARPpy,djgagne/SHARPpy,blizzardwarriorwx/SHARPpy,scollis/SHARPpy