Fixed saving properties properly