This also works, and is an improvement