Issue #82 fixed, need some more exploration