Fixed selection offset problem