Fix bug with Custom Location