Added a conditional.  close #459