fix proposal for 778, solve some bitrate switching issues