Fixed cases with difficult annotations. #321