Fix issue with options not being filled in if they're loaded async.