Fix for Smart Input threading issue