@property fixes