Updated check against double clicks