Fix them bugs!