Issue #78, again.