Use newer macro