Fixed an issue with the decoding dance