Also fixed in #609.