Fixes #672.