Fix last commit.
Merge pull request #1730 from yuriks/v3

Fix last commit.