Plz fix this, it broke (definitelyyyyyy) ONLY FOR CLASS
Ofc since this is about bugs I added a bug :)
