Fixed $@ parameter issue in command expension on all servers