Fix to work with later modules