Bug removed - most of wrong TSD eliminated