Fix classname
Merged with master