fix lag on open
Merge branch 'master' into Zoom