Bugfix: Better handling for correcting actors name