fix eager encoding with CSM