Temporary payment fix