fixed #127: partially caused by the "do not click icon" workaround and partially to incorrect delete