Fixed typo
Merge branch 'fix-oop'