Correct passed parameter
Start macro split out