Fixed to decoder more
Fixed XML