Fixed a bug.

Merge with initial commit.