Uncommented this to temporarily "fix" the feature selecting issue