Working in issue #3. Could you check to see if this fix is correct and not hiding a bigger problem?