Yes, your interpretation is correct. Try the new ruling a few times. If you don't like it, then feel free to go back to the original rules.