Added doubleclick, hack around concurrency issues