CS fix; use dot notation where possible