modified DefaultCodec.java