Fixing best secondary selection