Fixed crappy object-orientation