Stricter macro behaviour