More work on options bug