Will be fixed by #726.