fixed issues for big numbers