BugFix, added support for dry-run