Fixes: #2455 Fixed mac detection