Trying to fix codec bug still