fixed for xv-21