improve check
improve check in wui