jk, actually fixed the None error I mentioned in the previous commit