GrandDecoder bug fix