Trying to fix the nullmac