Bugfix for subjects