Bugfix for empty classes