Fixed the same number issue, see the comments