Issue #14: Bug fix (needs testing).