Fix module load order