Fix for target double click bug