Bug fix

Selection issue fix