Oops. Fixes #1 again.