Fixed dumb hack to get this OOP class working