Selection Fix
merge