Fix #804: Getting NoSuchMethodError when connecting to terminal