Fix to prevent a replication of select options