Finally fixing the ZZZZZZZ bug