Fixed follow-up to issue #6.