fix bugs -10-19-2