Fix option check