Issue #164. Starting from scratch.