This has been fixed and will be part of the next Touch 2.0 release. Thanks for the port and debugging done to solve this!