[MODIFIED] payment quickfix