Final tested fix