Fixed last code changes.