Fix Form rendering bug