Fixes #434.