I made some changes that will make the changes on this line obsolte. see #4444