fix for comment-121