Fix Check if custom name is given