Fix Problem 8,121,124,125