Fix properties?