Fix test_issue_36