Corrected module ordering