Issue #23 xpath overflow

This fixes issue #23