Issue #9 following jkuepper's note.