369 issue | FIX soon as i can