Fixed bug with empty locations