Fixed errors with losing points data