fixed condition on watch, check if defined "