fix packages and new macro