Fix type (cherry picked from commit 4599cfa)