propagate the fix also to the encoder