Options issues were fixed