Fix double click issue
Merging with latest bugfix from 1.9