Adding condition -refs #6599