Better fix to test then gh-1210