Dusan/ciselnik fix