Fixed $* -> $@