Issue #223 fix no result case