fixed empty location bug