fix issues with token payments