Default Selection fix