Fix for client side model binding