fix last 2 commits