Small change in Encoder