updated fix and macro