Fixed on-the-fly module loading