Fixed issue with selecting default