Removed No Selection Bug