Fixed Z-issue