Payment functionality fix