Jcollard/bug fixes #215

Closed jcollard closed 1 year ago