Fixes #501. Use client for visual.