Adjustment to close #74