Fixed duplicate addition of values