Resolve issue where number is saved to db as string, and escapse loop unwantedly