Fixing tashas issues.