FAIMS-560 - fix the module creation to allow more than one module creation at a time