Fix to include default location for scoping information