Fixed doubleclick bug