Fixed race checkbox not populating