finally fixed number issue