Payment drag bugfix