Finally pinned it down. Fixes #442