Fixed issue with spinner selection issues