Fix applied. Still not fully working