Be more intelligent when adding the asterisk.