Add some class.
Fix bug.