Location Button Bug Fix