Added fix for collection delete issue