Bugfix/class check