Fixed error on option checks