Data binding fix