Yet another decoder fix