Fixed entities decoding
0.0.2