Bugfix pt. OO