Fix: Do not override payment strings