added target fix, added debounce