ticket:38 better media record handling