Fixed a strange issue where too many arguments were being sent to the
application