Fix controller annotations

Fixes #23