Fixing re-setup issue #658