Bug in flick implementation

Please merge.