Option name bug fix