This modification follows the one on the module's core