fixed database option check