Fix no result issue