bug EDIDE-45 fixed