[MERGE] Necessary fix.