Reduce a redundancy
Bug revise