This should be fixed by [b9af6e4772]