Yeap, that fixes #1