Fix Target location to be optional