Tried to fix map clicking bug