Make the module more stable