Merge "Fixed a bug with the overflow number" into nyc-dev