Bug fix:
- handling Text properties