I changed this to be as you suggested.