Fixed for module consumption