still have issue
Fix a major bug