Merge fix from master for duplicate