refs #2584 - fixes issues