Fix edge case dupe issue with bag