Fix bug #134

As described in Issue #136, this should fix (or at least reduce) incorrect information being returned.