Fix CommonPacketHandler