add condition to check if theres a datafield at all
comments to an odd test