[refactor] We have Class.
[bugfix] We haz correct class.