Fixed Double Click Bug