Fix bug in timer selection part II