Fixed bugs in Number