toolstack fix