JBIDE-17211 - more clear, plus undo works