The performance related extra if call caused a bug when trying to decode