Fix: Serious bug on withdrawal
Merge pull request #1642 from fmarcet/develop

Fix: Serious bug on withdrawal