status bug fix, annotations