Restored static properties
Resotred old version
Restored static properties