refs #6287 implement fix for v1.4