Solution Z-fix