Bugfix moduleclasses

One of the 2 PRs will survive ;-)