Fix data check