fix:
Tracking properties not working
#824
Merged
fix:
Tracking properties not working
#824