-Fix issues with latest changes (coninue using lazy decode detection)