Fixed user interaction bug