Fix my previous abomination