Refs #670 - Attempt fix