Added logic to support hex in either case
S1C1 Now works!