Fix issue #36.

This fixes the issue #36.