ok, I think now it might actually work correctly with classes