pointQuery first returns invalid instance of Shape

Signed-off-by: Shuja Shabandri <shuja@shabandri.com>