Fixed both options cases.