This should be fixed in #888