Fixed Problem where arguments were not being replaced properly :S