EDIDE-81 fixed
indexing problems fixed