Simplified the way we deal with leading 1