Fixed NoneType mac problem