GH-30 fix the bug, server cashing with a fake unit query.