[bug_1411] Changed some stuff, like indetions