:bugs: Fixed wrong data property init
Updated
Merge Master