Bugfix in Module