Partial fix for async packets