Fixed issue where arguments were not parsed correctly