fix some regression