erik and I made the the same modification... merged.