Compilator bug fixing