fixed z parsing