Fix for comment-93