Fixed trailing numbers issue