minor fix (for those blank suffixes out of nowhere at the end of payload - not related to "-- ")