Same issue as previous commit.