Fix issue #23 on gestpay branch (different solution)