Removed bugs from previous commit.