This should fix issue refs #676.