Modules now enable properly