Although this might be fixed in @rocha's PR