Fix the handling of '*'