Fix #1159: Enable TImeSelector only when needed

Fix #1159