fixed issues in module Payment