This PR extends the last fix to another point where there is checked if an extension is enabled or not.