Correction to the previous commit. This is the version that was tested.