It's important that you adopt a systematic method of managing the behavior - that is, that you respond in exactly the same manner each time the behavior occurs. It sounds like you are doing a good job. For some additional guidance, consult Lynn Clark's book SOS Help for Parents (see sosprograns.com).