This should fixes crashes

refs #6