Two-way data binding fix