fix for comment-36