Option to disable check