fixed sam (again)