Added comment
Fixed UT