Make flick work reliably

Please merge.