select correct unit when user press skip button, fixes #298