Fix with Stokes suggested solution.