Re-implemented my fix because apparently my IDE decided to format the whole file.