Fixed my shenanigans