use simpler version of deprecated macro