Little correct to decoder. Still need to be fixed