Close GH-8: Fixed lost first option.