add handling edge cases like 00000000"