Attempt fix of Z-issues