Revert "Revert "fix workinglist problem""

This reverts commit a0475b24af5f7ad23c7b116e053bee8091de96db.