Fix regression caused by checking options