Fix for Z_OFFSET