Fix the retiring bug