This fixes the module for bug #8365.