Solve minor logic fail and add one thing