Fixing quick replace macro