Bugfix class