Fix my own nonsense