Just testing it again on a clean build, but it seems to have done the trick. The very last Note on the page you sent me did it 🙂