Fix my initial fuck-up