fixes.. another attempt to improve live rewind