some fix bugs setup