fix checking field existance