Fixes for double click