Fix duplicate entry issue added in [z2408]