Fix bug in which TB state would not be properly applied from wake