Fix to value checking for attributes