Allow device number to be > 9.