Bug fix auto-generating options