Worked around race in data-binding somewhere