RT2451:

I switched the cascading if/else-if to a switch and missed a break
statement; David caught it.