Fixes #477.