Fix bug in timer selection