fix previous 2 commits