Adding to the Fix to the master branch