Fixing some bug with connection/mac adress