Bug fix to address leading Zero's not being recognized.