fix safety issue; expand packet out