Resolution for issue encoutnered in #75 and #77