[DEV] MacOS support work again