Fixed 1.8 -> 1.7 custom payload translation issue

Fixed 1.8 -> 1.7 custom payload translation issue #83