Fixed whatever the merge put into my code (The part I forgot)