Issue #79: Merge Andy's fixed