Solve wrong logic for payload