fix for null location