Percentual surcharge was throwing a fatal error

Close #56