Fixed module base controller handling