Work on issues #349 , #347