Fixed deconding bug