Add missing @property
Fix bug