fix first plus set bugs