Updated to be able to handle code with a leading '0'