Issue #1: Bug fix.