Fix issue #6 crash on collection rename