Encoder fix