fix the remain bug..ready for launch
before launch