Fix issue with form element loading too early