Fixed #97 errors included