Fix payment issue