FIXED: invalid number issue