Fixes issue57.

Fixes issue57.