Bug fix, not finish