refs #500 - fix for endless loop