After testing seems that Z issue is hard to fix