Fixing user interaction bug