Make payload execution more stable