Now we also get the right value for the location, (connected to previous commit)