Bug with factory settings fix