Fixed issue with double payload