fixes with diego pt1