issue #56 fix query