Terrible! fix for legacy payments app