Another critical fix for decoder.