stop using domConstruct + fix issue