Fixed the component z-value algorithm