Im gonna try to add this change to the new PR.