This should fix the issue refs #725.