Fixed total-bug