Z fix (3/48)

Z fix