TW: Fixed payload mapping bug.