Fix for parsing $@