Merge pull request #1826 from malfredo32/haxtuple1