Fix Grabber bug