Adding one last enabled check