refs #4305 actually this seems to work but have to do many more tests