Fixed init value and return value according to the latest commit.