fixup some bug introduced by last commit.