Fixed problem with the location argument. Related to ticket:2877