Fix for issue #13

This patch fixes issue #13.