Code

Updated check in macro class