Hopefully this fixed all capturing issues.

Also added a minor check to validTarget() just in case... didn't help
with the current bug.