Option bug fixed