Corrected duplicate location bug