Fix #4417

This adresses the root of the problem, and ensures that the single
locaded module keeps the same context, shared with the standard
loaded modules