Optimise specially for grabber.
Bug fix.