Attempting to close #92 and #93