Fixes Basic Shapes

Forgot to enable/disable the client states.

Resolves issue #421