Fix bug where we were calculating tips wrong