fixed z completion