remove unwanted conditional issues by implementing comparison instead of $IFDEF
Activity