Fixed issues with last commit.