Fix gh-693 again, one level deeper