Double click is FINALLY fixed