Fix for #97

Fix for #97 -- parts of #65 will still need to be addressed.