Fixed re-creation of forms