new solution for issue with MAC