Fix on specified tag for client