Payment issue fix