Fix slow start & null result bug