Added fixSelection