Location fix on master template