Fixed for Decoding error