Fixed issue with mac generation