Fixing issue #128. Associating sp and charge.