Fixed no result issue