Fix tipping for good