Probably this is related to what you said about merging the two modules?