fix issues from Anna