Bug fix of inability to delete guides
Merge branch 'hotfix-2.0.4'