Commit on #82 fix