Hopefully fix weird things happening with class assignment.